Use cherry-pick -xe instead of git log amend

diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 4bda3f5c9099901142a352b3b952598b5043aaff..798f363881f775e1b25b46f40afd3673f487609b 100644 (file)
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -59,8 +59,7 @@ which will look like
 commit 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 cd ~/emacs/emacs-24
-git cherry-pick 958b768a6534ae6e77a8547a56fc31b46b63710b
-git commit --amend
+git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
 
 and add "Backport:" to the commit string.  Then